From ec619d3c3e391b33c9e9f7ba049cb0d323707306 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 24 Feb 2010 20:26:08 +0000 Subject: [PATCH] x86: Fix build error after c/s 20969:8cb6e7eff2ba Signed-off-by: Keir Fraser --- xen/arch/x86/traps.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 932ff43a69..1238e9cb96 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -892,8 +892,7 @@ asmlinkage void do_invalid_op(struct cpu_user_regs *regs) { struct bug_frame bug; struct bug_frame_str bug_str; - const void *p; - const char *filename, *predicate, *eip = (char *)regs->eip; + const char *p, *filename, *predicate, *eip = (char *)regs->eip; unsigned long fixup; int id, lineno; @@ -928,7 +927,7 @@ asmlinkage void do_invalid_op(struct cpu_user_regs *regs) if ( id == BUGFRAME_run_fn ) { - const void (*fn)(struct cpu_user_regs *) = p; + void (*fn)(struct cpu_user_regs *) = (void *)p; (*fn)(regs); regs->eip = (unsigned long)eip; return; -- 2.30.2